Fix calculation error in the (shouldn't happen) case where

Wed Jan 16 12:16:37 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkoptionmenu.c (gtk_option_menu_size_request): Fix
        calculation error in the (shouldn't happen) case where
        option_menu->height < child_requisition.height. (Patch
        from Jacob Berkman, #66969)

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 283a09a7ec9e78b55d124f0289d82488823da3f3..5b10f8bccf8117aaee512dde86983248b822ecff 100644 (file)
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -461,7 +461,7 @@ gtk_option_menu_size_request (GtkWidget      *widget,
                         MAX (child_requisition.height, option_menu->height) +
                         CHILD_TOP_SPACING + CHILD_BOTTOM_SPACING + props.focus_width * 2);
 
-  tmp = (requisition->height - option_menu->height +
+  tmp = (requisition->height - MAX (child_requisition.height, option_menu->height) +
         props.indicator_size.height + props.indicator_spacing.top + props.indicator_spacing.bottom);
   requisition->height = MAX (requisition->height, tmp);
 }